[FIX] pos_order_mgmt:compatibility with pos_restaurant #339
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pedrobaeza
requested changes
Mar 27, 2019
|
Even more: is it possible to directly cherry-pick the commit with the fix? |
carlos-domatix
force-pushed
the
11.0-fix-pos_order_mgmt-incompatibility-pos-restaurant
branch
from
7bf2e12
to
19fdd71
Compare
|
Note. Should be rebased. Can you do it @carlosDomatix ? |
pedrobaeza
approved these changes
Jul 11, 2019
|
But should rebase and resolve the conflicting file |
legalsylvain
added a commit
to legalsylvain/pos
that referenced
this pull request
Jul 15, 2019
legalsylvain
added a commit
to legalsylvain/pos
that referenced
this pull request
Jul 15, 2019
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix [REF] JS remove useless code [REF] Python remove useless code [ADD] pos order view form. Add links to original returned order and refund orders. [FIX] remove bad oldname [FIX] add _compute_refund_order_qty [IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id. [FIX] remove gap in bill display, when it is a refund [FIX] loaded orders date to local OCA#361 cortesy @chienandalu [IMP] Add helper on each button [FIX] when reprinting a bill, the returned order name is displayed, if any
legalsylvain
added a commit
to legalsylvain/pos
that referenced
this pull request
Jul 15, 2019
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix [FIX] add _compute_refund_order_qty [ADD] pos order view form. Add links to original returned order and refund orders. [IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id. [IMP] Add helper on each button [ADD] python test [REF] JS remove useless code [REF] Python remove useless code [FIX] remove bad oldname [FIX] remove gap in bill display, when it is a refund [FIX] when reprinting a bill, the returned order name is displayed, if any [FIX] JS lint, with OCA eslint file
legalsylvain
added a commit
to legalsylvain/pos
that referenced
this pull request
Jul 15, 2019
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix [FIX] add _compute_refund_order_qty [ADD] pos order view form. Add links to original returned order and refund orders. [IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id. [IMP] Add helper on each button [ADD] python test [REF] JS remove useless code [REF] Python remove useless code [FIX] remove bad oldname [FIX] remove gap in bill display, when it is a refund [FIX] when reprinting a bill, the returned order name is displayed, if any [FIX] JS lint, with OCA eslint file [ADD] french translation
carlos-domatix
force-pushed
the
11.0-fix-pos_order_mgmt-incompatibility-pos-restaurant
branch
from
19fdd71
to
13b321b
Compare
|
Rebased. |
|
/ocabot merge patch Thanks @carlosDomatix |
|
@legalsylvain at the moment, the bot command must be the last part of the comment. (OCA/oca-github-bot#53) So your command was ignored, can you retry? |
|
Thanks @sbidoul for this information. I was asking to myself if I can hide a little /ocabot command inside a comment. ;-) |
|
/ocabot merge patch |
|
On my way to merge this fine PR! |
OCA-git-bot
added a commit
that referenced
this pull request
Jul 16, 2019
|
Congratulations, your PR was merged at 644ecf2. Thanks a lot for contributing to OCA. ❤️ PS: Don't worry if GitHub says there are unmerged commits: it is due to a rebase before merge. All commits of this PR have been merged into |
OCA-git-bot
pushed a commit
that referenced
this pull request
Jul 18, 2019
[FIX] compatibility with pos_restaurant #339 cortesy @carlosDomatix [FIX] add _compute_refund_order_qty [ADD] pos order view form. Add links to original returned order and refund orders. [IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id. [IMP] Add helper on each button [ADD] python test [REF] JS remove useless code [REF] Python remove useless code [FIX] remove bad oldname [FIX] remove gap in bill display, when it is a refund [FIX] when reprinting a bill, the returned order name is displayed, if any [FIX] JS lint, with OCA eslint file [ADD] french translation
ammarofficewla
pushed a commit
to ammarofficewla/pos
that referenced
this pull request
Oct 7, 2019
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix [FIX] add _compute_refund_order_qty [ADD] pos order view form. Add links to original returned order and refund orders. [IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id. [IMP] Add helper on each button [ADD] python test [REF] JS remove useless code [REF] Python remove useless code [FIX] remove bad oldname [FIX] remove gap in bill display, when it is a refund [FIX] when reprinting a bill, the returned order name is displayed, if any [FIX] JS lint, with OCA eslint file [ADD] french translation
robyf70
pushed a commit
to LevelPrime/pos
that referenced
this pull request
Nov 20, 2019
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix [FIX] add _compute_refund_order_qty [ADD] pos order view form. Add links to original returned order and refund orders. [IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id. [IMP] Add helper on each button [ADD] python test [REF] JS remove useless code [REF] Python remove useless code [FIX] remove bad oldname [FIX] remove gap in bill display, when it is a refund [FIX] when reprinting a bill, the returned order name is displayed, if any [FIX] JS lint, with OCA eslint file [ADD] french translation
dalonsod
pushed a commit
to solvosci/pos
that referenced
this pull request
Jan 8, 2021
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix [FIX] add _compute_refund_order_qty [ADD] pos order view form. Add links to original returned order and refund orders. [IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id. [IMP] Add helper on each button [ADD] python test [REF] JS remove useless code [REF] Python remove useless code [FIX] remove bad oldname [FIX] remove gap in bill display, when it is a refund [FIX] when reprinting a bill, the returned order name is displayed, if any [FIX] JS lint, with OCA eslint file [ADD] french translation
fshah-initos
pushed a commit
to initOS/pos
that referenced
this pull request
Apr 19, 2021
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix [FIX] add _compute_refund_order_qty [ADD] pos order view form. Add links to original returned order and refund orders. [IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id. [IMP] Add helper on each button [ADD] python test [REF] JS remove useless code [REF] Python remove useless code [FIX] remove bad oldname [FIX] remove gap in bill display, when it is a refund [FIX] when reprinting a bill, the returned order name is displayed, if any [FIX] JS lint, with OCA eslint file [ADD] french translation
pedropote
pushed a commit
to pedropote/pos
that referenced
this pull request
May 17, 2022
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix [FIX] add _compute_refund_order_qty [ADD] pos order view form. Add links to original returned order and refund orders. [IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id. [IMP] Add helper on each button [ADD] python test [REF] JS remove useless code [REF] Python remove useless code [FIX] remove bad oldname [FIX] remove gap in bill display, when it is a refund [FIX] when reprinting a bill, the returned order name is displayed, if any [FIX] JS lint, with OCA eslint file [ADD] french translation
zamberjo
pushed a commit
to aurestic/pos
that referenced
this pull request
Apr 14, 2023
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix [FIX] add _compute_refund_order_qty [ADD] pos order view form. Add links to original returned order and refund orders. [IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id. [IMP] Add helper on each button [ADD] python test [REF] JS remove useless code [REF] Python remove useless code [FIX] remove bad oldname [FIX] remove gap in bill display, when it is a refund [FIX] when reprinting a bill, the returned order name is displayed, if any [FIX] JS lint, with OCA eslint file [ADD] french translation
zamberjo
pushed a commit
to aurestic/pos
that referenced
this pull request
Apr 19, 2023
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix [FIX] add _compute_refund_order_qty [ADD] pos order view form. Add links to original returned order and refund orders. [IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id. [IMP] Add helper on each button [ADD] python test [REF] JS remove useless code [REF] Python remove useless code [FIX] remove bad oldname [FIX] remove gap in bill display, when it is a refund [FIX] when reprinting a bill, the returned order name is displayed, if any [FIX] JS lint, with OCA eslint file [ADD] french translation
anmarmo1
pushed a commit
to aurestic/pos
that referenced
this pull request
May 3, 2023
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix [FIX] add _compute_refund_order_qty [ADD] pos order view form. Add links to original returned order and refund orders. [IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id. [IMP] Add helper on each button [ADD] python test [REF] JS remove useless code [REF] Python remove useless code [FIX] remove bad oldname [FIX] remove gap in bill display, when it is a refund [FIX] when reprinting a bill, the returned order name is displayed, if any [FIX] JS lint, with OCA eslint file [ADD] french translation
zamberjo
pushed a commit
to aurestic/pos
that referenced
this pull request
May 4, 2023
[FIX] compatibility with pos_restaurant OCA#339 cortesy @carlosDomatix [FIX] add _compute_refund_order_qty [ADD] pos order view form. Add links to original returned order and refund orders. [IMP] when refunding an order via the 'Refund' button in back office, set the correct returned_order_id. [IMP] Add helper on each button [ADD] python test [REF] JS remove useless code [REF] Python remove useless code [FIX] remove bad oldname [FIX] remove gap in bill display, when it is a refund [FIX] when reprinting a bill, the returned order name is displayed, if any [FIX] JS lint, with OCA eslint file [ADD] french translation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed #333 . cc @chienandalu